Repository navigation
Conversation
Undo the premature develop -> main promotion: it was merged at 19:09:56 with no review and no board, and it reset develop back to 01fecee on its way. The work is untouched on develop (squash 623954c for PRD-880 included); main simply goes back to the tree it had before the promotion. This reverts commit af1b780, reversing changes made to the first parent. Verified: the tree is byte-identical to af1b780^1 (a37b52c). [skip ci]
Contributor
Author
|
Closing this: npm has |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts the promotion merge
af1b7800(#665), at the owner's request, because it was merged at 19:09:56 with no review and no board — and because it resetdevelopback to01feceecon the way, dropping squash623954c8from the branch whilemainkept it.The work is not lost: every commit of that promotion is an ancestor of
develop(c1c25a65mergedmainback in), andgit diff main developis currently empty.This revert puts
mainback to exactly the tree it had before the promotion — verified:git diff af1b78005^1 HEADis empty (byte-identical). It is a tree-only change; no commit is deleted.After this lands, #666 (
develop → main) is a real promotion again: it will show the full library diff (the 198 files of the crowd/forest work plus PRD-880) and can be merged through the queue somainpublishes with a board behind it.[skip ci]is in the commit message: on the owner's instruction for tonight's branch surgery. Say the word if you want the full board on this revert instead, and I will drop the marker and re-push.